fix: preserve guardrail_latest_message wrapping after tool execution#1658
Merged
lizradway merged 3 commits intostrands-agents:mainfrom Feb 27, 2026
Merged
Conversation
lizradway
requested a deployment
to
manual-approval
GitHub Actions
Waiting
lizradway
requested a deployment
to
manual-approval
GitHub Actions
Waiting
Unshure
previously approved these changes
Feb 26, 2026
lizradway
previously approved these changes
Feb 26, 2026
Unshure
requested a deployment
to
manual-approval
GitHub Actions
Waiting
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
lizradway
requested a deployment
to
manual-approval
GitHub Actions
Waiting
lizradway
requested a deployment
to
manual-approval
GitHub Actions
Waiting
lizradway
force-pushed
the
fix/guardrail-latest-message-tool-result
branch
from
d331c91 to
9493084
Compare
lizradway
requested a deployment
to
manual-approval
GitHub Actions
Waiting
lizradway
requested a deployment
to
manual-approval
GitHub Actions
Waiting
lizradway
had a problem deploying
to
manual-approval
GitHub Actions
Failure
lizradway
requested a deployment
to
manual-approval
GitHub Actions
Waiting
When guardrail_latest_message=True, the guardContent wrapping was lost after tool execution because the last message was a toolResult (with no text/image content). Pre-compute the index of the last user message containing text or image content so wrapping is applied correctly even when subsequent toolResult messages follow. Fixes strands-agents#1651 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
lizradway
force-pushed
the
fix/guardrail-latest-message-tool-result
branch
from
bde90ea to
1a68f8d
Compare
lizradway
had a problem deploying
to
manual-approval
GitHub Actions
Failure
lizradway
had a problem deploying
to
manual-approval
GitHub Actions
Failure
|
Assessment: Approve Clean bug fix that correctly addresses the issue where Review Summary
Nice fix for a subtle but impactful bug! 🎉 |
Unshure
approved these changes
Feb 27, 2026
lizradway
approved these changes
Feb 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
guardrail_latest_messagewrapping being lost after tool execution, when the last message is atoolResultwith no text/image contentguardContentwrapping targets the correct message regardless of what follows itFixes #1651
Test plan
test_format_request_with_guardrail_latest_message_after_tool_use— verifies guardContent wraps the user text message when a toolResult followstest_format_request_with_guardrail_latest_message_wraps_final_user_text— verifies existing behavior (last message is text) still workstest_format_request_with_guardrail_latest_messagepasses (no regression)🤖 Generated with Claude Code